removed some obsolote aliases