Removed and refactored a couple classes that were missed.