Feature/remove register keyword