[POC] code cleanup