some cleanup
merge