Removed all typescript errors