Various tweaks; remove common packages (just caused obscure issues)