Revert "Fixing minor CiclosHobby Store issues"

This reverts commit 99e76e4567393b6e75d297197810614b67cc012f.
Merge branch 'master' into RESULTS_BRANCH