Cleaned up unnecessary things