Tidy: Removed unnecessary variables.
Tidy: Removed unused var and commented code.
Tidy: Corrected Error msg if require was not possible