[TASK] Basic clean up done