Better dealing with missing objects. Remove and sort all usings