Some final cleanup, maybe this is 0.1?