Removed some user interface stuff