Starting to clean up FPlayer