removed nonessential code