Removed hard coded data and hacks

Ready for future DDD Events