removed unused annotations, methods, imports and unnecessary cast