Removed old unneeded bits