Removed a few more interfaces