some cleaning stuff
merges