More cleanup, change version to 1.8.1