Edited in changes including static_helpers and deletion