removing some multiply by 1 statements
removed all the include_once references
cleaning up the incrementations