Removed obscure shortcuts