Massive performance improvement, removal of code from an ancient age
small features