Removes unused variables, and modules

Cleans up constants