Removed some unusued code