Fix APIs, remove stubs
First and new second floors