Issue #KOBA-20 by tj: Cleanup and symfony added