Removed used variables and library