rollback of API changes + code clean up