Removed some things that were no longer needed