Still need to remove unwanted files