Removed out commeted code