And remove test stuff.