Removed debug code and uneeded validation.

Removed validation on collection (needed for model only), and removed some comments and debug code.