Remove files don't need anymore

Need more testing.