Removing some old code