Clean up of files no longer in use or not needed due to other implemented functionality