Removing some mumbo jumbo