cleanup

Removed unneeded code