wip: cleaning up scripts