cleaned up a bunch of more or less useless interfaces/classes from Fel