Removed more unnecessary codes.