Deleted Unnecessary code/Camera issue

Another pull request to come, more code deletion and clean-up.