Adds Data annotation, removes unused code