removed unused/unnecessary code