Anirudha : general clean up