Cleanup forward declarations