UPDATED: finalizing hard fork and code cleanups