Obsolete usings removed