removed all code not necessary