removed commened out code