Removed useless folders to reflect v1.8.4.2 better