modif: commented out code removal