cleaned & current dev

cleaned old commits
in current dev