Fixed versions
Commented out not always necessary gedmo stuff