Cleaned up the poms and the classes.