Major clean up, map all IDs on unified matrix
Remove minor data dependency, minor cleanup