useless

and bad implementation anyway
slight refactoring
Merge branch 'feature-minor' into develop