much cleaner no-ui registration
cleaned up some files