Pointless stuff removed