Tidy: Remove pointless code