Cleaned up unnecessary code.