Cleaned up unnecessary code