Finished implementing limiters
Finished implementing limiters
Tidy up after finishing delegator & decorator refactorings