Code cleanup

Removed useless stuff