Minor changes and remove unnecessary files