Cleanup of acen managing code