Cleared unescessary code