Clean up WIPs (again)

DO NOT MERGE YET (I am looking at you @dietzc)