removed static classes