Removed crap
Merge branch 'master-kalli'