cleans up some code and stubs in some interactions