Fix removal of invalid functions
Avoid polluting the profile
Cleanup hash
Complete documentation