remove generic type + other fixes