Enflac simplified
Clean up done