Bugfixes
Add remove pending script