File cleanup, remove redundant templates etc