Trimming the fat

Removing unessential code