Removing some stuff, after refactoring api...