Cleanup of 'Assembly' namespace