cleanup after merging master..