Mandeep initial commit after removing unused code