Clean and upgrade to new syntax