Removed legacy code and indent fix.