more cleanup, also fixing the build breakage that i caused