Clean up from old code