Fix some syntax issues
Remove tags for now
Clean up