removed commented code (###)