Cleaning up shortcuts