Removed some codes