remove Zipcar stuff, other clean up