Clean up code on APL.