Removed two unused classes from a previous iteration...