GUI cleaned up