Code refactor, removed unused functions