Get rid of WIP stuff