clean up; v1.2.1 for Scala 2.11 and 2.10