Cleaned some old code