Removed unused member-variables and type-hint create