Cleanup from old code