MISC : some cleanup