Removed event system re thinking.