Some cleaning
Another pice of cleanup