Removed extraneous testing code and confirmed new structure is working