Remove excessive engine state