Remove buggy and unused forward declarations