Remove interface stuff for now