Update comments and remove obsolete code