Cleaned up unserialized component system