More Interface Cleanup