Mumbo jumbo in the constructor is no longer needed.