20140921 - removed classes, updated POM