clean up unused elements
Clean up tests
Merge branch 'feature/clean_up' into develop
protect url search parameters