Cleaned up unnecessary modules and features.