Code cleanup

Removed a few unneeded functions