misc: some cleanup