cleaned up: deleted some unused code