Getting rid of 'Hidden Factory'