Removed Functions

Cleaned unused functions