Removed unused configuration, uncommented modeshape features