20120902 WLA Clean Up and Maintenance