Shortcuts and cleanup