removed commnented code