Series of registration fixes
Get rid of fixtures