Cleaning up for v1.1.5