Removed some unnecessary functions and such