Delete some unnecessary files, simplify includes.