Code cleanup (new API)