clean up terminology and checks for "static" systems