Removed unwanted types