Further clean-up
Further clean-up

shwetank/devopera,operasoftware/devopera,andreasbovens/devopera,operasoftware/devopera,shwetank/devopera,shwetank/devopera,andreasbovens/devopera,operasoftware/devopera,operasoftware/devopera,andreasbovens/devopera