Cleanup

Took unncessary code