remove unneeded includes, fix variable names