Adengine cleanups