* Remove generics to ease analysis with GPS
        * Update prove target
        * Work in progress, remove generic