Removed some junk/unused code