Removed useless code
Comments
removed an obsolet fixme