Cleaning up unnecessary code.