Removed the extra stuff