cleaning up flowstation some more