Minor refactor,
Removed
Big block of commit.