Remove code copy/pasta'd from our other app