Reference and generated cleaned up