Sundry project file and make cleanup