Some more pointless stuff removed