Restructure code
Delete it