Removed commented code
Externalized profile validation