Remove extra stuff