Use absolute namespace in annotations
Elminate unused variables