Bug Fixes
Removes redundant code.
Removes redundant code.
Updates Test