Removed some headers and now redundant functions.