More removal of old/commented code and cleanup of the ugly typedef of engine_pp.