Refactored some old code
This files is spurious