FULL commentary in core and deleted some unused code and events