Removed some functions that might not that useful

Removed and simplified some of the functions.