clean up some observers and properties from the refactor