Cleanup

Removed some unused functions