Removed reliance on backbone events as lacked control needed and was unreliable