Remove any code that will fail the static type checker