remove use of factories and create directly static classes