Fixed bug, removed unnecessary headers