cleanup

finish cleanup on the final few leftovers.