Deprecated comments removed and general house keeping.