Deleted lots of code moved over to Data