removed extras, should be ready for merge