Clean-up

Removed some useless code