Cleanup and bumped to 1.5.5