Remove forward declaration