Cleaning up #29