cleanup and tearing out boxen-related stuff