Minor changes and Phoenix removal