even more cleanup
even more cleanup2