removed unused code (commented out)