removed unneede check
delete unused code
minor adjstments in test
new xml
hmm that was strange