Cleanup, added better hardware profile objectizer.