Extra code dremoved