Code cleanup

Removed stupid redundant code