Cleaned up command/builder relationship