bitta cleanup
bitta cleanup pt 2