Cleanup, include only engine-code