removed null logs.
Added more nullable verification to infra fields.
Removed deprecated classes and all assigments.
Added function call to the correct class. Fixes #72