Clean up 'create'-features