Removed useless shortcuts