Cleanup done on some variables