Putlocker: merged #322
+ cleanup