Fixing NPE in PojoConverter
Cleaned up code, removing unused methods