Fix repeated events
Merge branch '6359-3.14' of github.com:openscholar/openscholar into 6359-3.14
Remove un-needed code