Removed old PS and updated aliases