Warning police: Removed useless catch-all clause