removing some confusing codes