Remove unneeded methods and merge mess
Move event filtering stuff into it's own view class. Additional
cleanups elsewhere.
Fix weird limit range edge cases