WIP: Remove redundant code