cleant methods v9
Merge branch 'master' of github.com:ohtuprojekti/OKKoPa_all
clean methods v11