[TASK] remove unnecessary stuff