Removed commented sections after refactoring