AdrianC: Removing some code thats not really needed.