Clean code
remove files and fix tests
remove form type definition
Merge branch 'master' into core_bundle