removed a large block of unneeded method cods