Removining the with call since the context is not being used
Removing Builder layer from Alexei
Removing unused classes