Cut the fat

Unnecessary code removed