cleaned up header file and other unused code