Removed more code