Cleaned up stateless code. The entire stateless API is now supported