Cleaned up poms, and make implementations consistent with the rest of calrissian