General cleanup of GUI classes