More cleanup. Removal of alias commands