removed unneeded headers. found bug