Further cleanup
more cleanup