Cleaned up flow, removed Sample Filter