[CLEANUP] Removes superfluous function
[TASK] Simplifies functions