Fix to Null pointer

Removed unused code that was from our old system.