Removed unused variables from main file