Forgot some deletions. Some features are broken.