cleaned up: unused code removed