Cleanup for L
More cleanup for L