Minor cleanup
Remove maps
linting
Fix contact us