Removed some unused code from previous versions