Remove reference to aeolus and some slight cleanup