Removed unneded commands and shortcuts