removed unnecessary headers and code