[TASK] Remove external stuff, add extra