WIP - remove debugging logs