Remove unwanted acng module
Cleanup style and a few minor changes (I bet a broke something.  Need to get tests soon.)