Cleanup, last commit borked stuff