[TASK] Further CLean up
[TASK] Basic clean up done