Remove (unneccessary?) object allocation