prune cleanup, comments. rm still commented out