More variable cleanup (delete) and other fixes