Removed ui cruft