Remove more overhead and conditional classes