Cleaned up registry nonsense