Huge cleanup
NG is default now + fixes