I am going to upgrade my g&g cm16 (short) to fit my cqb needs better. I am going to saw the front sight off since its not removable, buy, flip up sights, and get a new moter. Got any other ideas for this? I was also thinking of re wiring it to the front and using a fake peq box to store the battery but i dont know. I think my buffer tube is dust.