Remove several includes and add comment about z-filtering