some cleanup
preparing to pull
merging...