Removing some obsolete functions.
Removing some unnecessary require statements.