some deletions and cleanup based on Xcode analysis