remove old include
formatting
typo
remove old code