clean up and uncomment aliases