Removed API related stuff for now, until I can figure out this server memory issue