Removed some unused functions
Merge branch 'cleanup'