Taint fixes

Removed remaining right click code that was causing execution taint