Eliminated header file