removing unnecessary forward declaration and header import