Removing test/commented code