removed obsolete elements

Why did you introduce this change?