code cleanup and build 1.1.6