FIX: removed obsolete code from factory