Removed deprecated aliases and logic