Ensure cleanup of Select Statement operations

This will error until #18 is merged.