Removed more codes