Slight cleanup, remove unused WIPs