cleaned up codebase
Merge branch 'hotfix/cannnot_redirect'