Removed obsolete code, fixed some issues reported by Sonar
Release 0.11.0