Remove unneccessary includes, etc.