Clean up of unused attributes