chg: dev: removing unnecessary elements