Remove lots of [very unnecessary] code