Removed some very unnecessary functions.