implements DISABLE_SERIALIZATION to help Shane. However it is highly discouraged to use this in your standard builds. Please test yoru code without this before you make a commit. Minor clean up included