(cleanup) Update comments; Remove obsolete code