Merge branch 'rzlee-cleanup' into cleanup