Clean up GUI classes