Clean and update of poms, context, and code