general cleanup
merge