cleanup imports/TODO before server overhaul