removed all code that is not ours