Removed static declarations from generic type