Removed two unused classes