Fastfix: removing old if-else
Merge branch 'master' into production