Cleaned up unnecessary stuff.