Removed comment bloat
Removed rekuire dependency
Fixed some references in project test