removed extra files, added missing method declarations to header files, commented out unneededmethod calls