Getting rid of some old nonsense