Remove unused variables, set strict compiler warnings, move unused utils to helper file for readability