Removed more extras