Clean up WIPs

DO NOT MERGE YET!