Remove more obsolete code
Update the common
Update the definition