removing some obsoleate code