Cleaned up existing classes