cleanups for shortcuts