Remove unused annotation & imports