Added my own aliases removing un-used ones