thanpa: Removed unused parsers + added more required classes