delete unused folders and tidy up UI