Removing unused UserText
Fixing controller factory