WIP: remove helper functions
WIP