Remove check stuff and add consistency to uniform location naming.