Moving more methods off DroudGuice