Cleaning obsolete code, add comments