Cleaning

Removal of some unused class (remnants from first version)
Removal of unused messages from the message bundle
Design update for a test class, useless for now but maybe useful later