remove Update by: Iulian Alexe