removed unused line and variables