Remove unused helper files, clean up few files.