removed unnecessary includes, cleaned up