remove dodgy "if" statement