Removed extras