Remove intermediary classes