Remove stuff deprecated in 0.4