[FIX] removed commented out code, extra includes