remove dumb stuff, move other dumb stuff