Clean up of unused legacy code
Clean up of unused legacy code
Clean up of unused legacy code