remove all of the Phoenix/AzALL stuff from 060506b0de5ec87c8368ca9adbbe74272563d1f3