Remove old classes just one class and verify bad functions don't work.
Refactored
Added some documentation and fixed extra parameter issue.