Problem with changing API. Removing everything