optimization and rebuild
removed unused comment