Remove attributes and fix things up