Cleaned up- and removed all  calls in favor of throwing an error.