New package
Use simpler syntax
Dead code
rename
Simpler code