Removed useless comments
redoing schema
Added tenancy setting before creating tenant dependant entries
Removed an extra empty space