Remove hack that tried to improve project load speed
Add support for method overloads and prettier names for Generics