Put aspect code in entities. Removed some dummy data.