Cosmetic changes

Thrown away useless parts of code