Cleanup from latest development