Remove unused methods and optimise current event detection