Removed unused property.
Fixed bugs related to moving logic from __construct() to init().
Bug fixes.