More cleanup and fixed Cancel from Twitter problem