removed imports of nested static classes, maven does not like this