Moved agenda, removed derby db reference