No to removing the horns and tails.
Yes to Square getting it together and fixing the clipping problems and providing black/white scales