Cleaning up
Removing unused code
Adding check for view settings
Bugfix
Merge branch 'feature/CleanUp' into release/0.0.7