Fix issues
Remove from deploy branch