Cleanup phase 3

Removed a few redundant functions