[TASK] Cleaned up code

[BUGFIX] Revert