removed some codes