Code base

Removed unused variables.